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 94F2AA25A6 for ; Mon, 19 Jun 2023 09:29:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 75A67252E5 for ; Mon, 19 Jun 2023 09:28:54 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 19 Jun 2023 09:28:53 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 4356D7F8D; Mon, 19 Jun 2023 09:28:45 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 4201A24168E; Mon, 19 Jun 2023 09:28:45 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 19 Jun 2023 09:28:34 +0200 Message-Id: <20230619072841.38531-6-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230619072841.38531-1-aderumier@odiso.com> References: <20230619072841.38531-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.037 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v6 qemu-server 03/10] memory: use static_memory in foreach_dimm 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, 19 Jun 2023 07:29:24 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuServer/Memory.pm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index 12e6ee4..ee73a0a 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -151,17 +151,15 @@ sub get_numa_guest_to_host_map { } sub foreach_dimm{ - my ($conf, $vmid, $memory, $sockets, $func) = @_; + my ($conf, $vmid, $memory, $static_memory, $func) = @_; my $dimm_id = 0; - my $current_size = 0; + my $current_size = $static_memory; my $dimm_size = 0; if($conf->{hugepages} && $conf->{hugepages} == 1024) { - $current_size = 1024 * $sockets; $dimm_size = 1024; } else { - $current_size = 1024; $dimm_size = 512; } @@ -206,7 +204,7 @@ sub qemu_memory_hotplug { my $numa_hostmap; - foreach_dimm($conf, $vmid, $value, $sockets, sub { + foreach_dimm($conf, $vmid, $value, $static_memory, sub { my ($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory) = @_; return if $current_size <= get_current_memory($conf->{memory}); @@ -393,7 +391,7 @@ sub config { } if ($hotplug) { - foreach_dimm($conf, $vmid, $memory, $sockets, sub { + foreach_dimm($conf, $vmid, $memory, $static_memory, sub { my ($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory) = @_; my $mem_object = print_mem_object($conf, "mem-$name", $dimm_size); @@ -559,7 +557,7 @@ sub hugepages_topology { if ($hotplug) { my $numa_hostmap = get_numa_guest_to_host_map($conf); - foreach_dimm($conf, undef, $memory, $sockets, sub { + foreach_dimm($conf, undef, $memory, $static_memory, sub { my ($conf, undef, $name, $dimm_size, $numanode, $current_size, $memory) = @_; $numanode = $numa_hostmap->{$numanode}; -- 2.39.2