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 CFE1365645 for ; Mon, 7 Mar 2022 13:17:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 390B727485 for ; Mon, 7 Mar 2022 13:17:58 +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 6484727190 for ; Mon, 7 Mar 2022 13:17:49 +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 3BEB341DB4 for ; Mon, 7 Mar 2022 13:17:49 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 7 Mar 2022 13:17:34 +0100 Message-Id: <20220307121743.60206-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220307121743.60206-1-f.ebner@proxmox.com> References: <20220307121743.60206-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.125 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: [pve-devel] [PATCH v11 qemu-server 06/14] clone disk: allow cloning from an unused or unreferenced disk 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, 07 Mar 2022 12:17:58 -0000 and also when source and target drivename are different. In those cases, it is done via qemu-img convert/dd. In preparation to allow import from existing PVE-managed disks. Signed-off-by: Fabian Ebner --- New in v11. PVE/API2/Qemu.pm | 2 ++ PVE/QemuServer.pm | 29 +++++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 14cac5b..01321c8 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -3229,6 +3229,7 @@ __PACKAGE__->register_method({ my $dest_info = { vmid => $newid, conf => $oldconf, # because it's a clone + drivename => $opt, storage => $storage, format => $format, }; @@ -3488,6 +3489,7 @@ __PACKAGE__->register_method({ my $dest_info = { vmid => $vmid, conf => $conf, + drivename => $disk, storage => $storeid, format => $format, }; diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 56437c5..0217d16 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7574,15 +7574,25 @@ sub clone_disk { my ($storecfg, $source, $dest, $full, $newvollist, $jobs, $completion, $qga, $bwlimit) = @_; my ($vmid, $running) = $source->@{qw(vmid running)}; - my ($drivename, $drive, $snapname) = $source->@{qw(drivename drive snapname)}; + my ($src_drivename, $drive, $snapname) = $source->@{qw(drivename drive snapname)}; - my ($newvmid, $conf) = $dest->@{qw(vmid conf)}; + my ($newvmid, $conf, $dst_drivename) = $dest->@{qw(vmid conf drivename)}; my ($storage, $format) = $dest->@{qw(storage format)}; + if ($src_drivename && $dst_drivename && $src_drivename ne $dst_drivename) { + die "cloning from/to EFI disk requires EFI disk\n" + if $src_drivename eq 'efidisk0' || $dst_drivename eq 'efidisk0'; + die "cloning from/to TPM state requires TPM state\n" + if $src_drivename eq 'tpmstate0' || $dst_drivename eq 'tpmstate0'; + } + my $newvolid; + print "create " . ($full ? 'full' : 'linked') . " clone of drive "; + print "$src_drivename " if $src_drivename; + print "($drive->{file})\n"; + if (!$full) { - print "create linked clone of drive $drivename ($drive->{file})\n"; $newvolid = PVE::Storage::vdisk_clone($storecfg, $drive->{file}, $newvmid, $snapname); push @$newvollist, $newvolid; } else { @@ -7592,7 +7602,6 @@ sub clone_disk { my $dst_format = resolve_dst_disk_format($storecfg, $storeid, $volname, $format); - print "create full clone of drive $drivename ($drive->{file})\n"; my $name = undef; my $size = undef; if (drive_is_cloudinit($drive)) { @@ -7603,9 +7612,9 @@ sub clone_disk { } $snapname = undef; $size = PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE; - } elsif ($drivename eq 'efidisk0') { + } elsif ($dst_drivename eq 'efidisk0') { $size = get_efivars_size($conf); - } elsif ($drivename eq 'tpmstate0') { + } elsif ($dst_drivename eq 'tpmstate0') { $dst_format = 'raw'; $size = PVE::QemuServer::Drive::TPMSTATE_DISK_SIZE; } else { @@ -7629,9 +7638,9 @@ sub clone_disk { } my $sparseinit = PVE::Storage::volume_has_feature($storecfg, 'sparseinit', $newvolid); - if (!$running || $snapname) { + if (!$running || !$src_drivename || $snapname) { # TODO: handle bwlimits - if ($drivename eq 'efidisk0') { + if ($dst_drivename eq 'efidisk0') { # 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 @@ -7647,9 +7656,9 @@ sub clone_disk { qemu_img_convert($drive->{file}, $newvolid, $size, $snapname, $sparseinit); } } else { - die "cannot move TPM state while VM is running\n" if $drivename eq 'tpmstate0'; + die "cannot move TPM state while VM is running\n" if $src_drivename eq 'tpmstate0'; - qemu_drive_mirror($vmid, $drivename, $newvolid, $newvmid, $sparseinit, $jobs, + qemu_drive_mirror($vmid, $src_drivename, $newvolid, $newvmid, $sparseinit, $jobs, $completion, $qga, $bwlimit); } } -- 2.30.2