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 3E29296495 for ; Tue, 24 Jan 2023 14:05:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2188A3BA2 for ; Tue, 24 Jan 2023 14:05:02 +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 ; Tue, 24 Jan 2023 14:04:59 +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 B036845EAA; Tue, 24 Jan 2023 14:04:59 +0100 (CET) Message-ID: <52e53f17-d329-20f1-1f64-55902f638daf@proxmox.com> Date: Tue, 24 Jan 2023 14:04:58 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 From: Fiona Ebner To: pve-devel@lists.proxmox.com, "aderumier@odiso.com" References: <20230104064303.2898194-1-aderumier@odiso.com> <20230104064303.2898194-4-aderumier@odiso.com> Content-Language: en-US In-Reply-To: <20230104064303.2898194-4-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.593 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 NICE_REPLY_A -1.148 Looks like a legit reply (A) 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. [memory.pm] Subject: Re: [pve-devel] [PATCH v2 qemu-server 3/9] memory: add get_static_mem 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: Tue, 24 Jan 2023 13:05:32 -0000 Am 04.01.23 um 07:42 schrieb Alexandre Derumier: > Signed-off-by: Alexandre Derumier > --- > PVE/QemuServer/Memory.pm | 43 +++++++++++++++++++++------------------- > 1 file changed, 23 insertions(+), 20 deletions(-) > > diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm > index 59e51c8..e9c0115 100644 > --- a/PVE/QemuServer/Memory.pm > +++ b/PVE/QemuServer/Memory.pm > @@ -15,7 +15,6 @@ get_current_memory > ); > > my $MAX_NUMA = 8; > -my $STATICMEM = 1024; > > my $memory_fmt = { > current => { > @@ -47,6 +46,26 @@ sub parse_memory { > return $res; > } > > +my sub get_static_mem { > + my ($conf, $defaults) = @_; Rather than passing in $defaults, you can pass in $sockets. I think all callers already have that available. > + > + my $sockets = $conf->{sockets} || $defaults->{sockets}; > + my $hotplug_features = PVE::QemuServer::parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1'); Could also rather be passed-in as a parameter, maybe even as a simple boolean to test for directly instead of $hotplug_features. In the longer term, it'd be nice to get rid of the cylic usage of PVE::QemuServer and having such calls deep in private methods doesn't help there. > + > + my $static_memory = 0; > + my $memory = parse_memory($conf->{memory}); > + > + if ($hotplug_features->{memory}) { > + #legacy > + $static_memory = 1024; > + $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024); > + } else { > + $static_memory = $memory->{current}; > + } > + > + return $static_memory; > +} > + > my $_host_bits; > my sub get_host_phys_address_bits { > return $_host_bits if defined($_host_bits);