proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-02 15:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

version_guard: early out when major/minor version is high enough

Browse Source 
E.g.: If a feature requires 4.1+pveN and we're using machine version 4.2
we don't need to increase the pve version to N (4.2+pve0 is enough).

We check this by doing a min_version call against a non-existant higher
pve-version for the major/minor tuple we want to test for, which can
only work if the major/minor alone is high enough.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2020-03-19 11:03:13 +01:00 committed by Thomas Lamprecht
parent 03c8cbd1dc
commit 47f35977cb
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/QemuServer.pm
View File

@ -2962,6 +2962,8 @@ sub config_to_command {
my $version_guard = sub { my $version_guard = sub {
my ($major, $minor, $pve) = @_; my ($major, $minor, $pve) = @_;
return 0 if !min_version($machine_version, $major, $minor, $pve); return 0 if !min_version($machine_version, $major, $minor, $pve);
my $max_pve = PVE::QemuServer::Machine::get_pve_version("$major.$minor");
return 1 if min_version($machine_version, $major, $minor, $max_pve+1);
$required_pve_version = $pve if $pve && $pve > $required_pve_version; $required_pve_version = $pve if $pve && $pve > $required_pve_version;
return 1; return 1;
}; };