It's confusing that the config associated to the destination is
actually a reference to the source config for both existing callers.
Also, disk import will need to base the calculation on the passed-in
drive parameters and not just the current config, so this change is in
preparation for that too.
Signed-off-by: Fabian Ebner <f.eb...@proxmox.com>
---
New in v12.
PVE/API2/Qemu.pm | 8 ++++++--
PVE/QemuServer.pm | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 14cac5b..9b8eb88 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -3228,11 +3228,13 @@ __PACKAGE__->register_method({
my $dest_info = {
vmid => $newid,
- conf => $oldconf, # because it's a clone
storage => $storage,
format => $format,
};
+ $dest_info->{efisize} =
PVE::QemuServer::get_efivars_size($oldconf)
+ if $opt eq 'efidisk0';
+
my $newdrive = PVE::QemuServer::clone_disk(
$storecfg,
$source_info,
@@ -3487,11 +3489,13 @@ __PACKAGE__->register_method({
my $dest_info = {
vmid => $vmid,
- conf => $conf,
storage => $storeid,
format => $format,
};
+ $dest_info->{efisize} = PVE::QemuServer::get_efivars_size($conf)
+ if $disk eq 'efidisk0';
+
my $newdrive = PVE::QemuServer::clone_disk(
$storecfg,
$source_info,
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 56437c5..ed06239 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -7576,7 +7576,7 @@ sub clone_disk {
my ($vmid, $running) = $source->@{qw(vmid running)};
my ($drivename, $drive, $snapname) = $source->@{qw(drivename drive
snapname)};
- my ($newvmid, $conf) = $dest->@{qw(vmid conf)};
+ my ($newvmid, $efisize) = $dest->@{qw(vmid efisize)};
my ($storage, $format) = $dest->@{qw(storage format)};
my $newvolid;
@@ -7604,7 +7604,7 @@ sub clone_disk {
$snapname = undef;
$size = PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE;
} elsif ($drivename eq 'efidisk0') {
- $size = get_efivars_size($conf);
+ $size = $efisize or die "internal error - need to specify EFI disk
size\n";
} elsif ($drivename eq 'tpmstate0') {
$dst_format = 'raw';
$size = PVE::QemuServer::Drive::TPMSTATE_DISK_SIZE;
--
2.30.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
