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 C209D93CB5 for ; Wed, 22 Feb 2023 16:19:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A3F841A7AF for ; Wed, 22 Feb 2023 16:19:13 +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 ; Wed, 22 Feb 2023 16:19:13 +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 DFA9948141; Wed, 22 Feb 2023 16:19:12 +0100 (CET) Message-ID: Date: Wed, 22 Feb 2023 16:19:12 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 From: Fiona Ebner To: Proxmox VE development discussion , Alexandre Derumier References: <20230213120021.3783742-1-aderumier@odiso.com> <20230213120021.3783742-11-aderumier@odiso.com> Content-Language: en-US In-Reply-To: <20230213120021.3783742-11-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.044 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 NICE_REPLY_A -0.095 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 Subject: Re: [pve-devel] [PATCH v4 qemu-server 10/16] 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: Wed, 22 Feb 2023 15:19:43 -0000 Am 13.02.23 um 13:00 schrieb Alexandre Derumier: > current qemu_dimm_list can return any kind of memory devices. > > make it more generic, with a regex filter to choose kind of device > from id. > > 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 c912e4f..a13b3a1 100644 > --- a/PVE/QemuServer/Memory.pm > +++ b/PVE/QemuServer/Memory.pm > @@ -333,7 +333,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(\d+)$'); > last if !$dimm_list->{$name}; > raise_param_exc({ $name => "error unplug memory module" }) if $retry > 5; > $retry++; > @@ -363,14 +363,14 @@ sub can_hotplug { > return 1; > } > > -sub qemu_dimm_list { > - my ($vmid) = @_; > +sub qemu_memdevices_list { > + my ($vmid, $filter) = @_; Nit: not sure if we really need/want a full-blown filter here. I'd just start out with a $type and we can make sure to only use IDs of the form $type\d+. If we ever need more, we can always change it to a filter. > > my $dimmarray = mon_cmd($vmid, "query-memory-devices"); > my $dimms = {}; > > foreach my $dimm (@$dimmarray) { > - > + next if $filter && $dimm->{data}->{id} !~ /$filter/; > $dimms->{$dimm->{data}->{id}}->{id} = $dimm->{data}->{id}; > $dimms->{$dimm->{data}->{id}}->{node} = $dimm->{data}->{node}; > $dimms->{$dimm->{data}->{id}}->{addr} = $dimm->{data}->{addr};