From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2165CA78C for ; Mon, 21 Nov 2022 08:25:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 073A228F91 for ; Mon, 21 Nov 2022 08:25:18 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 21 Nov 2022 08:25:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EEE4144DA6 for ; Mon, 21 Nov 2022 08:25:16 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 21 Nov 2022 08:25:13 +0100 Message-Id: <20221121072513.25366-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server] api: create/update vm: fix clamping cpuunits function calls X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Nov 2022 07:25:18 -0000 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 --- 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