* [pve-devel] [PATCH qemu-server] api: create/update vm: fix clamping cpuunits function calls
@ 2022-11-21 7:25 Fiona Ebner
2022-11-21 7:27 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Fiona Ebner @ 2022-11-21 7:25 UTC (permalink / raw)
To: pve-devel
When applying the series introducing those calls, the helper was moved
to pve-common's CGroup.pm (see 07c10d5 ("cgroup: move get_cpuunits
helper from qemu-server as clamp_cpu_shares") in pve-common) instead
of pve-guest-common's GuestHelpers.pm. But these calls were not
updated.
Reported in the community forum:
https://forum.proxmox.com/threads/118267
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
PVE/API2/Qemu.pm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index b0c40fa5..b8a93346 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -13,6 +13,7 @@ use Crypt::OpenSSL::Random;
use Socket qw(SOCK_STREAM);
use PVE::APIClient::LWP;
+use PVE::CGroup;
use PVE::Cluster qw (cfs_read_file cfs_write_file);;
use PVE::RRD;
use PVE::SafeSyslog;
@@ -818,7 +819,7 @@ __PACKAGE__->register_method({
PVE::Tools::validate_ssh_public_keys($ssh_keys);
}
- $param->{cpuunits} = PVE::GuestHelpers::get_cpuunits($param->{cpuunits})
+ $param->{cpuunits} = PVE::CGroup::clamp_cpu_shares($param->{cpuunits})
if defined($param->{cpuunits}); # clamp value depending on cgroup version
PVE::Cluster::check_cfs_quorum();
@@ -1481,7 +1482,7 @@ my $update_vm_api = sub {
PVE::Tools::validate_ssh_public_keys($ssh_keys);
}
- $param->{cpuunits} = PVE::GuestHelpers::get_cpuunits($param->{cpuunits})
+ $param->{cpuunits} = PVE::CGroup::clamp_cpu_shares($param->{cpuunits})
if defined($param->{cpuunits}); # clamp value depending on cgroup version
die "no options specified\n" if !$delete_str && !$revert_str && !scalar(keys %$param);
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH qemu-server] api: create/update vm: fix clamping cpuunits function calls
2022-11-21 7:25 [pve-devel] [PATCH qemu-server] api: create/update vm: fix clamping cpuunits function calls Fiona Ebner
@ 2022-11-21 7:27 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2022-11-21 7:27 UTC (permalink / raw)
To: Proxmox VE development discussion, Fiona Ebner
Am 21/11/2022 um 08:25 schrieb Fiona Ebner:
> When applying the series introducing those calls, the helper was moved
> to pve-common's CGroup.pm (see 07c10d5 ("cgroup: move get_cpuunits
> helper from qemu-server as clamp_cpu_shares") in pve-common) instead
> of pve-guest-common's GuestHelpers.pm. But these calls were not
> updated.
>
> Reported in the community forum:
> https://forum.proxmox.com/threads/118267
>
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> PVE/API2/Qemu.pm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-21 7:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-21 7:25 [pve-devel] [PATCH qemu-server] api: create/update vm: fix clamping cpuunits function calls Fiona Ebner
2022-11-21 7:27 ` [pve-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox