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 D31D4911F7 for ; Fri, 17 Mar 2023 14:38:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AF9201A465 for ; Fri, 17 Mar 2023 14:38:58 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 17 Mar 2023 14:38:57 +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 66E0D44F73; Fri, 17 Mar 2023 14:38:57 +0100 (CET) Message-ID: Date: Fri, 17 Mar 2023 14:38:56 +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-2-aderumier@odiso.com> From: Fiona Ebner In-Reply-To: <20230224120915.1481910-2-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 01/12] memory: rename qemu_dimm_list to qemu_memdevices_list 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:38:58 -0000 Am 24.02.23 um 13:09 schrieb Alexandre Derumier: > current qemu_dimm_list can return any kind of memory devices. > > make it more generic, with an optionnal type device > > Signed-off-by: Alexandre Derumier > --- > PVE/QemuServer/Memory.pm | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm > index 8984821..7ad8fcb 100644 > --- a/PVE/QemuServer/Memory.pm > +++ b/PVE/QemuServer/Memory.pm > @@ -240,7 +240,7 @@ sub qemu_memory_hotplug { > while (1) { > eval { PVE::QemuServer::qemu_devicedel($vmid, $name) }; > sleep 3; > - my $dimm_list = qemu_dimm_list($vmid); > + my $dimm_list = qemu_memdevices_list($vmid, 'dimm'); > last if !$dimm_list->{$name}; > raise_param_exc({ $name => "error unplug memory module" }) if $retry > 5; > $retry++; > @@ -255,14 +255,14 @@ sub qemu_memory_hotplug { > } > } > > -sub qemu_dimm_list { > - my ($vmid) = @_; > +sub qemu_memdevices_list { > + my ($vmid, $type) = @_; > > my $dimmarray = mon_cmd($vmid, "query-memory-devices"); > my $dimms = {}; > > foreach my $dimm (@$dimmarray) { > - > + next if $type && $dimm->{data}->{id} !~ /^$type(\d+)$/; > $dimms->{$dimm->{data}->{id}}->{id} = $dimm->{data}->{id}; > $dimms->{$dimm->{data}->{id}}->{node} = $dimm->{data}->{node}; > $dimms->{$dimm->{data}->{id}}->{addr} = $dimm->{data}->{addr}; applied, thanks!