verify than defined vm memorymax is not bigger than host cpu supported memory
Add add early check in update vm api Signed-off-by: Alexandre Derumier <aderum...@odiso.com> --- PVE/API2/Qemu.pm | 46 +++++++++++++++++++++++++--------------- PVE/QemuServer/Memory.pm | 19 ++++++++++++++++- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 6c08280..f94c92b 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -32,7 +32,7 @@ use PVE::QemuServer::Drive; use PVE::QemuServer::ImportDisk; use PVE::QemuServer::Monitor qw(mon_cmd); use PVE::QemuServer::Machine; -use PVE::QemuServer::Memory qw(get_current_memory); +use PVE::QemuServer::Memory qw(get_current_memory parse_memory get_host_max_mem); use PVE::QemuMigrate; use PVE::RPCEnvironment; use PVE::AccessControl; @@ -476,6 +476,33 @@ my $create_disks = sub { return ($vollist, $res); }; +my $check_memory_param = sub { + my ($conf, $param) = @_; + + my $mem = parse_memory($param->{memory}); + my $host_max_mem = get_host_max_mem($conf); + + die "memory max can't be bigger than supported cpu architecture $host_max_mem MiB\n" + if $mem->{max} && $mem->{max} > $host_max_mem; + + if ($param->{memory} || defined($param->{balloon})) { + + my $maxmem = undef; + if ($param->{memory}) { + $maxmem = get_current_memory($param->{memory}); + } elsif ($conf->{pending}->{memory}) { + $maxmem = get_current_memory($conf->{pending}->{memory}); + } else { + $maxmem = get_current_memory($conf->{memory}); + } + + my $balloon = defined($param->{balloon}) ? $param->{balloon} : $conf->{pending}->{balloon} || $conf->{balloon}; + + die "balloon value too large (must be smaller than assigned memory)\n" + if $balloon && $balloon > $maxmem; + } +}; + my $check_cpu_model_access = sub { my ($rpcenv, $authuser, $new, $existing) = @_; @@ -1606,22 +1633,7 @@ my $update_vm_api = sub { } } - if ($param->{memory} || defined($param->{balloon})) { - - my $maxmem = undef; - if ($param->{memory}) { - $maxmem = get_current_memory($param->{memory}); - } elsif ($conf->{pending}->{memory}) { - $maxmem = get_current_memory($conf->{pending}->{memory}); - } else { - $maxmem = get_current_memory($conf->{memory}); - } - - my $balloon = defined($param->{balloon}) ? $param->{balloon} : $conf->{pending}->{balloon} || $conf->{balloon}; - - die "balloon value too large (must be smaller than assigned memory)\n" - if $balloon && $balloon > $maxmem; - } + &$check_memory_param($conf, $param); PVE::Cluster::log_msg('info', $authuser, "update VM $vmid: " . join (' ', @paramarr)); diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index a46b504..b5f1076 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -14,6 +14,8 @@ use base qw(Exporter); our @EXPORT_OK = qw( get_current_memory +parse_memory +get_host_max_mem ); my $MAX_NUMA = 8; @@ -93,7 +95,7 @@ my sub get_host_phys_address_bits { return; # undef, cannot really do anything.. } -my sub get_max_mem { +sub get_host_max_mem { my ($conf) = @_; my $cpu = {}; @@ -127,6 +129,21 @@ my sub get_max_mem { return $bits_to_max_mem > 4*1024*1024 ? 4*1024*1024 : $bits_to_max_mem; } +my sub get_max_mem { + my ($conf) = @_; + + my $host_max_mem = get_host_max_mem($conf); + my $mem = parse_memory($conf->{memory}); + + if ($mem->{max}) { + die "configured memory max can't be bigger than supported cpu architecture $host_max_mem MiB\n" + if $mem->{max} > $host_max_mem; + return $mem->{max}; + } + + return $host_max_mem; +} + sub get_current_memory { my ($value) = @_; -- 2.30.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel