to make the interface more digestible.
Signed-off-by: Fabian Ebner <f.eb...@proxmox.com>
---
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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
