proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-12-08 11:00:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

version_guard scsi drive count

Browse Source 
Live-migrating a VM with more than 14 SCSI disks to a node that doesn't
support it yet is broken. Use a bumped pve-version to represent that and
give the user a nice error message instead.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2020-02-10 16:05:36 +01:00 committed by Thomas Lamprecht
parent ac0077cc33
commit b8fb1c03c3
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/QemuServer.pm
View File

@ -3931,6 +3931,9 @@ sub config_to_command {
my ($maxdev, $controller, $controller_prefix) = scsihw_infos($conf, $drive); my ($maxdev, $controller, $controller_prefix) = scsihw_infos($conf, $drive);
die "scsi$drive->{index}: machine version 4.1~pve2 or higher is required to use more than 14 SCSI disks\n"
if $drive->{index} > 13 && !&$version_guard(4, 1, 2);
$pciaddr = print_pci_addr("$controller_prefix$controller", $bridges, $arch, $machine_type); $pciaddr = print_pci_addr("$controller_prefix$controller", $bridges, $arch, $machine_type);
my $scsihw_type = $scsihw =~ m/^virtio-scsi-single/ ? "virtio-scsi-pci" : $scsihw; my $scsihw_type = $scsihw =~ m/^virtio-scsi-single/ ? "virtio-scsi-pci" : $scsihw;

2
PVE/QemuServer/Machine.pm
View File

@ -9,7 +9,7 @@ use PVE::QemuServer::Monitor;
# Bump this for VM HW layout changes during a release (where the QEMU machine # Bump this for VM HW layout changes during a release (where the QEMU machine
# version stays the same) # version stays the same)
our $PVE_MACHINE_VERSION = { our $PVE_MACHINE_VERSION = {
'4.1' => 1, '4.1' => 2,
}; };
sub machine_type_is_q35 { sub machine_type_is_q35 {