proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-28 03:50:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow manual ballooning if shares is set to zero

Browse Source
This commit is contained in:
Dietmar Maurer 2012-12-28 14:06:46 +01:00
parent 074e01c819
commit 7bfdeb5f90
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/API2/Qemu.pm
View File

@ -829,6 +829,8 @@ __PACKAGE__->register_method({
my $storecfg = PVE::Storage::config(); my $storecfg = PVE::Storage::config();
my $defaults = PVE::QemuServer::load_defaults();
&$resolve_cdrom_alias($param); &$resolve_cdrom_alias($param);
# now try to verify all parameters # now try to verify all parameters
@ -875,6 +877,14 @@ __PACKAGE__->register_method({
PVE::QemuServer::check_lock($conf) if !$skiplock; PVE::QemuServer::check_lock($conf) if !$skiplock;
if ($param->{memory} || defined($param->{balloon})) {
my $maxmem = $param->{memory} || $conf->{memory} || $defaults->{memory};
my $balloon = defined($param->{balloon}) ? $param->{balloon} : $conf->{balloon};
die "balloon value too large (must be smaller than assigned memory)\n"
if $balloon > $maxmem;
}
PVE::Cluster::log_msg('info', $authuser, "update VM $vmid: " . join (' ', @paramarr)); PVE::Cluster::log_msg('info', $authuser, "update VM $vmid: " . join (' ', @paramarr));
foreach my $opt (@delete) { # delete foreach my $opt (@delete) { # delete
@ -882,6 +892,8 @@ __PACKAGE__->register_method({
&$vmconfig_delete_option($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $force); &$vmconfig_delete_option($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $force);
} }
my $running = PVE::QemuServer::check_running($vmid);
foreach my $opt (keys %$param) { # add/change foreach my $opt (keys %$param) { # add/change
$conf = PVE::QemuServer::load_config($vmid); # update/reload $conf = PVE::QemuServer::load_config($vmid); # update/reload
@ -904,6 +916,14 @@ __PACKAGE__->register_method({
PVE::QemuServer::update_config_nolock($vmid, $conf, 1); PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
} }
} }
# allow manual ballooning if shares is set to zero
if ($running && defined($param->{balloon}) &&
defined($conf->{shares}) && ($conf->{shares} == 0)) {
my $balloon = $param->{'balloon'} || $conf->{memory} || $defaults->{memory};
PVE::QemuServer::vm_mon_cmd($vmid, "balloon", value => $balloon*1024*1024);
}
}; };
PVE::QemuServer::lock_config($vmid, $updatefn); PVE::QemuServer::lock_config($vmid, $updatefn);