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

fix balloon consistency check (consider pending changes)

Browse Source 
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer 2014-11-17 09:37:11 +01:00
parent 055d554dfa
commit 6ca8b69870
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/API2/Qemu.pm
View File

@ -945,10 +945,9 @@ my $update_vm_api = sub {
PVE::QemuServer::check_lock($conf) if !$skiplock; PVE::QemuServer::check_lock($conf) if !$skiplock;
# fixme: wrong place? howto handle pending changes? @delete ?
if ($param->{memory} || defined($param->{balloon})) { if ($param->{memory} || defined($param->{balloon})) {
my $maxmem = $param->{memory} || $conf->{memory} || $defaults->{memory}; my $maxmem = $param->{memory} || $conf->{pending}->{memory} || $conf->{memory} || $defaults->{memory};
my $balloon = defined($param->{balloon}) ? $param->{balloon} : $conf->{balloon}; my $balloon = defined($param->{balloon}) ? $param->{balloon} : $conf->{pending}->{balloon} || $conf->{balloon};
die "balloon value too large (must be smaller than assigned memory)\n" die "balloon value too large (must be smaller than assigned memory)\n"
if $balloon && $balloon > $maxmem; if $balloon && $balloon > $maxmem;