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 40117E677 for ; Fri, 9 Dec 2022 20:28:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0DF6827267 for ; Fri, 9 Dec 2022 20:27:38 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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, 9 Dec 2022 20:27:37 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id BBC327E61; Fri, 9 Dec 2022 20:27:28 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id BA768FC3BA; Fri, 9 Dec 2022 20:27:28 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com, t.lamprecht@proxmox.com Date: Fri, 9 Dec 2022 20:27:21 +0100 Message-Id: <20221209192726.1499142-6-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221209192726.1499142-1-aderumier@odiso.com> References: <20221209192726.1499142-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records 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 Subject: [pve-devel] [PATCH qemu-server 05/10] memory: get_max_mem: use config memory max 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, 09 Dec 2022 19:28:08 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuServer/Memory.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index 90e355b..b847742 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -91,7 +91,15 @@ my sub get_max_mem { # heuristic: remove 20 bits to get MB and half that as QEMU needs some overhead my $bits_to_max_mem = int(1<<($bits - 21)); - return $bits_to_max_mem > 4*1024*1024 ? 4*1024*1024 : $bits_to_max_mem; + my $cpu_max_mem = $bits_to_max_mem > 4*1024*1024 ? 4*1024*1024 : $bits_to_max_mem; + + my $confmem = PVE::QemuServer::parse_memory($conf->{memory}); + if($confmem->{max}) { + die "configured memory max can't be bigger than supported cpu architecture $cpu_max_mem MB" if $confmem->{max} > $cpu_max_mem; + return $confmem->{max}; + } + + return $cpu_max_mem; } sub get_current_memory{ -- 2.30.2