proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-11 15:19:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

followup: iterate over pending changes sorted

Browse Source 
for a more deterministic behavior, should not change things in
practice

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-10-22 12:47:16 +02:00
parent fb4d1ba27e
commit d321c4a921
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/QemuServer.pm
View File

@ -4856,9 +4856,9 @@ sub vmconfig_hotplug_pending {
my $hotplug_features = parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1'); my $hotplug_features = parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1');
my $pending_delete_hash = PVE::QemuConfig->parse_pending_delete($conf->{pending}->{delete}); my $pending_delete_hash = PVE::QemuConfig->parse_pending_delete($conf->{pending}->{delete});
foreach my $opt (keys %$pending_delete_hash) { foreach my $opt (sort keys %$pending_delete_hash) {
my $force = $pending_delete_hash->{$opt}->{force};
next if $selection && !$selection->{$opt}; next if $selection && !$selection->{$opt};
my $force = $pending_delete_hash->{$opt}->{force};
eval { eval {
if ($opt eq 'hotplug') { if ($opt eq 'hotplug') {
die "skip\n" if ($conf->{hotplug} =~ /memory/); die "skip\n" if ($conf->{hotplug} =~ /memory/);
@ -5055,7 +5055,7 @@ sub vmconfig_apply_pending {
# cold plug # cold plug
my $pending_delete_hash = PVE::QemuConfig->parse_pending_delete($conf->{pending}->{delete}); my $pending_delete_hash = PVE::QemuConfig->parse_pending_delete($conf->{pending}->{delete});
foreach my $opt (keys %$pending_delete_hash) { foreach my $opt (sort keys %$pending_delete_hash) {
die "internal error" if $opt =~ m/^unused/; die "internal error" if $opt =~ m/^unused/;
my $force = $pending_delete_hash->{$opt}->{force}; my $force = $pending_delete_hash->{$opt}->{force};
$conf = PVE::QemuConfig->load_config($vmid); # update/reload $conf = PVE::QemuConfig->load_config($vmid); # update/reload