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 D563E91174 for ; Fri, 17 Mar 2023 14:39:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BE7EA1A4C1 for ; Fri, 17 Mar 2023 14:39:05 +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 ; Fri, 17 Mar 2023 14:39:05 +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 E72BA44F73; Fri, 17 Mar 2023 14:39:04 +0100 (CET) Message-ID: <6f83e5f1-dcc1-772f-c5db-1e7e66b67317@proxmox.com> Date: Fri, 17 Mar 2023 14:39:04 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Content-Language: en-US To: Proxmox VE development discussion , Alexandre Derumier References: <20230224120915.1481910-1-aderumier@odiso.com> <20230224120915.1481910-3-aderumier@odiso.com> From: Fiona Ebner In-Reply-To: <20230224120915.1481910-3-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.002 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. [memory.pm] Subject: [pve-devel] applied: [PATCH v5 qemu-server 02/12] memory: don't use foreach_reversedimm for unplug 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, 17 Mar 2023 13:39:05 -0000 Am 24.02.23 um 13:09 schrieb Alexandre Derumier: > simple use dimm_list() returned by qemu > > Signed-off-by: Alexandre Derumier Thanks! Applied with this follow-up: > memory: hotplug: sort by numerical ID rather than slot when unplugging > > While, usually, the slot should match the ID, it's not explicitly > guaranteed and relies on QEMU internals. Using the numerical ID is > more future-proof and more consistent with plugging, where no slot > information (except the maximum limit) is relied upon. > > Signed-off-by: Fiona Ebner > --- > PVE/QemuServer/Memory.pm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm > index 0f4229c5..0601dd6c 100644 > --- a/PVE/QemuServer/Memory.pm > +++ b/PVE/QemuServer/Memory.pm > @@ -201,7 +201,7 @@ sub qemu_memory_hotplug { > my $dimms = qemu_memdevices_list($vmid, 'dimm'); > > my $current_size = $memory; > - for my $name (sort { $dimms->{$b}->{slot} <=> $dimms->{$a}->{slot} } keys %$dimms) { > + for my $name (sort { ($b =~ /^dimm(\d+)$/)[0] <=> ($a =~ /^dimm(\d+)$/)[0] } keys %$dimms) { > > my $dimm_size = $dimms->{$name}->{size} / 1024 / 1024; >