yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add a warnings array to import-metadata

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2024-03-08 13:34:31 +01:00
committed by Thomas Lamprecht
parent a3271a47ca
commit 203d73baf9
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/PVE/Storage/ESXiPlugin.pm
View File

@ -898,8 +898,13 @@ sub get_create_args {
my $create_args = {}; my $create_args = {};
my $create_disks = {}; my $create_disks = {};
my $create_net = {}; my $create_net = {};
my $warnings = [];
my $ignored_volumes = {}; my $ignored_volumes = {};
my $warn = sub {
push @$warnings, { message => $_[0] };
};
my ($cores, $sockets) = $self->cpu_info(); my ($cores, $sockets) = $self->cpu_info();
$create_args->{cores} = $cores if $cores != 1; $create_args->{cores} = $cores if $cores != 1;
$create_args->{sockets} = $sockets if $sockets != 1; $create_args->{sockets} = $sockets if $sockets != 1;
@ -990,17 +995,23 @@ sub get_create_args {
$boot_order .= $bus.$count; $boot_order .= $bus.$count;
}; };
$self->for_each_disk($add_disk); $self->for_each_disk($add_disk);
for my $nvme (@nvmes) { if (@nvmes) {
my ($slot, $file, $devtype, $kind) = @$nvme; $warn->("PVE currently does not support NVMe guest disks, they are converted to SCSI");
$add_disk->('nvme', $slot, $file, $devtype, $kind, 1); for my $nvme (@nvmes) {
my ($slot, $file, $devtype, $kind) = @$nvme;
$add_disk->('nvme', $slot, $file, $devtype, $kind, 1);
}
} }
$scsihw //= $default_scsihw; $scsihw //= $default_scsihw;
if ($firmware eq 'efi' && !defined($scsihw) || $scsihw =~ /^lsi/) { if ($firmware eq 'efi') {
if ($is_windows) { if (!defined($scsihw) || $scsihw =~ /^lsi/) {
$scsihw = 'pvscsi'; if ($is_windows) {
} else { $scsihw = 'pvscsi';
$scsihw = 'virtio-scsi-single'; } else {
$scsihw = 'virtio-scsi-single';
}
$warn->("OVMF is built without LSI drivers, scsi hardware was set to $scsihw");
} }
} }
$create_args->{scsihw} = $scsihw; $create_args->{scsihw} = $scsihw;
@ -1026,6 +1037,7 @@ sub get_create_args {
disks => $create_disks, disks => $create_disks,
net => $create_net, net => $create_net,
'ignored-volumes' => $ignored_volumes, 'ignored-volumes' => $ignored_volumes,
warnings => $warnings,
}; };
} }