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 D6C1765E78 for ; Wed, 9 Mar 2022 11:09:33 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EA4E31B9AF for ; Wed, 9 Mar 2022 11:09:29 +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 5A7C51B7F4 for ; Wed, 9 Mar 2022 11:09:25 +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 33210463F3 for ; Wed, 9 Mar 2022 11:09:25 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 9 Mar 2022 11:09:07 +0100 Message-Id: <20220309100919.31512-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309100919.31512-1-f.ebner@proxmox.com> References: <20220309100919.31512-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.124 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 v12 qemu-server 05/16] clone disk: group source and target parameters 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: Wed, 09 Mar 2022 10:09:33 -0000 to make the interface more digestible. Signed-off-by: Fabian Ebner --- PVE/API2/Qemu.pm | 52 +++++++++++++++++++++++++++++++---------------- PVE/QemuServer.pm | 9 ++++++-- 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index c6587ef..14cac5b 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -3218,23 +3218,31 @@ __PACKAGE__->register_method({ push @$storage_list, $storage if defined($storage); my $clonelimit = PVE::Storage::get_bandwidth_limit('clone', $storage_list, $bwlimit); + my $source_info = { + vmid => $vmid, + running => $running, + drivename => $opt, + drive => $drive, + snapname => $snapname, + }; + + my $dest_info = { + vmid => $newid, + conf => $oldconf, # because it's a clone + storage => $storage, + format => $format, + }; + my $newdrive = PVE::QemuServer::clone_disk( $storecfg, - $vmid, - $running, - $opt, - $drive, - $snapname, - $newid, - $storage, - $format, + $source_info, + $dest_info, $fullclone->{$opt}, $newvollist, $jobs, $completion, $oldconf->{agent}, $clonelimit, - $oldconf ); $newconf->{$opt} = PVE::QemuServer::print_drive($newdrive); @@ -3469,23 +3477,31 @@ __PACKAGE__->register_method({ $bwlimit ); + my $source_info = { + vmid => $vmid, + running => $running, + drivename => $disk, + drive => $drive, + snapname => undef, + }; + + my $dest_info = { + vmid => $vmid, + conf => $conf, + storage => $storeid, + format => $format, + }; + my $newdrive = PVE::QemuServer::clone_disk( $storecfg, - $vmid, - $running, - $disk, - $drive, - undef, - $vmid, - $storeid, - $format, + $source_info, + $dest_info, 1, $newvollist, undef, undef, undef, $movelimit, - $conf, ); $conf->{$disk} = PVE::QemuServer::print_drive($newdrive); diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index c0fca49..56437c5 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7571,8 +7571,13 @@ sub qemu_blockjobs_cancel { } sub clone_disk { - my ($storecfg, $vmid, $running, $drivename, $drive, $snapname, - $newvmid, $storage, $format, $full, $newvollist, $jobs, $completion, $qga, $bwlimit, $conf) = @_; + 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 ($newvmid, $conf) = $dest->@{qw(vmid conf)}; + my ($storage, $format) = $dest->@{qw(storage format)}; my $newvolid; -- 2.30.2