From b7bc7ae9dadc53a9590d447204c1ca6b1bb0effb Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 8 Sep 2023 13:30:41 +0200 Subject: [PATCH] api: pool update: refactor/code-clean-up guest handling Signed-off-by: Thomas Lamprecht --- PVE/API2/Pool.pm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm index 2463207e..ffcc3946 100644 --- a/PVE/API2/Pool.pm +++ b/PVE/API2/Pool.pm @@ -172,15 +172,12 @@ __PACKAGE__->register_method ({ delete $usercfg->{vms}->{$vmid}; } else { die "VM $vmid is already a pool member\n" if $pool_config->{vms}->{$vmid}; - my $existing_pool = $usercfg->{vms}->{$vmid}; - if (defined($existing_pool)) { - if ($param->{transfer}) { - $rpcenv->check($authuser, "/pool/$existing_pool", ['Pool.Allocate']); - my $existing_pool_config = $usercfg->{pools}->{$existing_pool}; - delete $existing_pool_config->{vms}->{$vmid}; - } else { - die "VM $vmid belongs already to pool '$existing_pool' and transfer is not set\n"; - } + if (defined(my $existing_pool = $usercfg->{vms}->{$vmid})) { + die "VM $vmid belongs already to pool '$existing_pool' and 'transfer' is not set\n" + if !$param->{transfer}; + + $rpcenv->check($authuser, "/pool/$existing_pool", ['Pool.Allocate']); + delete $usercfg->{pools}->{$existing_pool}->{vms}->{$vmid}; } $pool_config->{vms}->{$vmid} = 1; $usercfg->{vms}->{$vmid} = $pool; -- 2.39.5