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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D62CD8E0A for ; Fri, 1 Sep 2023 12:24:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B82FA14499 for ; Fri, 1 Sep 2023 12:23:57 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 1 Sep 2023 12:23:57 +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 CD62047D14; Fri, 1 Sep 2023 12:23:56 +0200 (CEST) Message-ID: Date: Fri, 1 Sep 2023 12:23:52 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 To: Proxmox VE development discussion , Alexandre Derumier References: <20230619072841.38531-1-aderumier@odiso.com> <20230619072841.38531-2-aderumier@odiso.com> Content-Language: en-US From: Fiona Ebner In-Reply-To: <20230619072841.38531-2-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.663 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 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -3.478 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. [qemuconfig.pm] Subject: Re: [pve-devel] [PATCH v6 qemu-server 01/10] add memory parser 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, 01 Sep 2023 10:24:27 -0000 Am 19.06.23 um 09:28 schrieb Alexandre Derumier: > Signed-off-by: Alexandre Derumier > --- There's a new usage for get_dervied_property() since this patch was sent. Please add it to the next version: > diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm > index d4230895..0e4b1eb8 100644 > --- a/PVE/QemuConfig.pm > +++ b/PVE/QemuConfig.pm > @@ -549,8 +549,8 @@ sub get_derived_property { > my $cpus = > ($conf->{sockets} || $defaults->{sockets}) * ($conf->{cores} || $defaults->{cores}); > return $conf->{vcpus} || $cpus; > - } elsif ($name eq 'max-memory') { > - return ($conf->{memory} || $defaults->{memory}) * 1024 * 1024; > + } elsif ($name eq 'max-memory') { # current usage maximum, not maximum hotpluggable > + return (get_current_memory($conf->{memory}) || $defaults->{memory}) * 1024 * 1024; > } else { > die "unknown derived property - $name\n"; > } >