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 <f.ebner@proxmox.com>

diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
index 0f4229c5e497543773c748479be19fe2aa835db6..0601dd6c446c5e28ce94eb98f64237960af34d3f 100644 (file)
--- 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;