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 172EF9189F for ; Fri, 7 Oct 2022 14:42:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0E7FE25F37 for ; Fri, 7 Oct 2022 14:42:12 +0200 (CEST) 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 ; Fri, 7 Oct 2022 14:42:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0037944847 for ; Fri, 7 Oct 2022 14:42:05 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 7 Oct 2022 14:41:48 +0200 Message-Id: <20221007124156.110246-12-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221007124156.110246-1-f.ebner@proxmox.com> References: <20221007124156.110246-1-f.ebner@proxmox.com> 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 1/3] move get_cpuunits helper to guest-common 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: Fri, 07 Oct 2022 12:42:44 -0000 while making it take the value directly instead of the config. Signed-off-by: Fiona Ebner --- Dependency bump for guest-common needed. PVE/QemuServer.pm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 4e85dd02..73e38292 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3446,21 +3446,6 @@ sub query_understood_cpu_flags { return \@flags; } -my sub get_cpuunits { - my ($conf) = @_; - my $is_cgroupv2 = PVE::CGroup::cgroup_mode() == 2; - - my $cpuunits = $conf->{cpuunits}; - return $is_cgroupv2 ? 100 : 1024 if !defined($cpuunits); - - if ($is_cgroupv2) { - $cpuunits = 10000 if $cpuunits >= 10000; # v1 can be higher, so clamp v2 there - } else { - $cpuunits = 2 if $cpuunits < 2; # v2 can be lower, so clamp v1 there - } - return $cpuunits; -} - # Since commit 277d33454f77ec1d1e0bc04e37621e4dd2424b67 in pve-qemu, smm is not off by default # anymore. But smm=off seems to be required when using SeaBIOS and serial display. my sub should_disable_smm { @@ -4994,7 +4979,7 @@ sub vmconfig_hotplug_pending { die "skip\n" if !$hotplug_features->{memory}; $value = PVE::QemuServer::Memory::qemu_memory_hotplug($vmid, $conf, $defaults, $opt, $value); } elsif ($opt eq 'cpuunits') { - my $new_cpuunits = get_cpuunits({ $opt => $conf->{pending}->{$opt} }); # to clamp + my $new_cpuunits = PVE::GuestHelpers::get_cpuunits($conf->{pending}->{$opt}); #clamp $cgroup->change_cpu_shares($new_cpuunits, 1024); } elsif ($opt eq 'cpulimit') { my $cpulimit = $conf->{pending}->{$opt} == 0 ? -1 : int($conf->{pending}->{$opt} * 100000); @@ -5624,7 +5609,7 @@ sub vm_start_nolock { # timeout should be more than enough here... PVE::Systemd::wait_for_unit_removed("$vmid.scope", 20); - my $cpuunits = get_cpuunits($conf); + my $cpuunits = PVE::GuestHelpers::get_cpuunits($conf->{cpuunits}); my %run_params = ( timeout => $statefile ? undef : $start_timeout, -- 2.30.2