Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2024-12-24 21:34:43 +03:00
Code Releases Activity

memory: rename qemu_dimm_list to qemu_memdevices_list

Browse Source 
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 <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2023-02-24 13:09:04 +01:00 committed by Fiona Ebner
parent 49c51a60db
commit 1e28e8ba92
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/QemuServer/Memory.pm
View File

@ -240,7 +240,7 @@ sub qemu_memory_hotplug {
while (1) { while (1) {
eval { PVE::QemuServer::qemu_devicedel($vmid, $name) }; eval { PVE::QemuServer::qemu_devicedel($vmid, $name) };
sleep 3; sleep 3;
my $dimm_list = qemu_dimm_list($vmid); my $dimm_list = qemu_memdevices_list($vmid, 'dimm');
last if !$dimm_list->{$name}; last if !$dimm_list->{$name};
raise_param_exc({ $name => "error unplug memory module" }) if $retry > 5; raise_param_exc({ $name => "error unplug memory module" }) if $retry > 5;
$retry++; $retry++;
@ -255,14 +255,14 @@ sub qemu_memory_hotplug {
} }
} }
sub qemu_dimm_list { sub qemu_memdevices_list {
my ($vmid) = @_; my ($vmid, $type) = @_;
my $dimmarray = mon_cmd($vmid, "query-memory-devices"); my $dimmarray = mon_cmd($vmid, "query-memory-devices");
my $dimms = {}; my $dimms = {};
foreach my $dimm (@$dimmarray) { foreach my $dimm (@$dimmarray) {
next if $type && $dimm->{data}->{id} !~ /^$type(\d+)$/;
$dimms->{$dimm->{data}->{id}}->{id} = $dimm->{data}->{id}; $dimms->{$dimm->{data}->{id}}->{id} = $dimm->{data}->{id};
$dimms->{$dimm->{data}->{id}}->{node} = $dimm->{data}->{node}; $dimms->{$dimm->{data}->{id}}->{node} = $dimm->{data}->{node};
$dimms->{$dimm->{data}->{id}}->{addr} = $dimm->{data}->{addr}; $dimms->{$dimm->{data}->{id}}->{addr} = $dimm->{data}->{addr};