]> git.proxmox.com Git - qemu-server.git/commitdiff
remove vm access permissions after destroy
authorAlen Grizonic <a.grizonic@proxmox.com>
Thu, 13 Aug 2015 10:21:36 +0000 (12:21 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Fri, 14 Aug 2015 06:07:24 +0000 (08:07 +0200)
removed duplicated code which was used in
PVE::AccessControl -> now in PVE::API2::Qemu

Signed-off-by: Alen Grizonic <a.grizonic@proxmox.com>
PVE/API2/Qemu.pm

index 1910d0990c68333de44cc842e8ea49bf6dc6ebe8..24a066f578600540b31403d664430e660aa81b29 100644 (file)
@@ -1140,17 +1140,6 @@ __PACKAGE__->register_method({
 
        my $storecfg = PVE::Storage::config();
 
-       my $delVMfromPoolFn = sub {
-           my $usercfg = cfs_read_file("user.cfg");
-           if (my $pool = $usercfg->{vms}->{$vmid}) {
-               if (my $data = $usercfg->{pools}->{$pool}) {
-                   delete $data->{vms}->{$vmid};
-                   delete $usercfg->{vms}->{$vmid};
-                   cfs_write_file("user.cfg", $usercfg);
-               }
-           }
-       };
-
        my $realcmd = sub {
            my $upid = shift;
 
@@ -1158,7 +1147,7 @@ __PACKAGE__->register_method({
 
            PVE::QemuServer::vm_destroy($storecfg, $vmid, $skiplock);
 
-           PVE::AccessControl::remove_vm_from_pool($vmid);
+           PVE::AccessControl::remove_vm_access($vmid);
        };
 
        return $rpcenv->fork_worker('qmdestroy', $vmid, $authuser, $realcmd);