proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-29 15:24:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

destroy_vm: remove VM config *after* unused disk removal

Browse Source 
As mentioned on the mailing list [0] disks owned by the VM and unused
disks should be removed before the config file is removed.

[0] https://pve.proxmox.com/pipermail/pve-devel/2019-October/039593.html

Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Dominic Jäger 2019-10-25 11:24:01 +02:00 committed by Thomas Lamprecht
parent 20faf21e87
commit dfda979e61
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/QemuServer.pm
View File

@ -2592,12 +2592,6 @@ sub destroy_vm {
}); });
if ($keep_empty_config) {
PVE::QemuConfig->write_config($vmid, { memory => 128 });
} else {
PVE::QemuConfig->destroy_config($vmid);
}
# also remove unused disk # also remove unused disk
eval { eval {
my $dl = PVE::Storage::vdisk_list($storecfg, undef, $vmid); my $dl = PVE::Storage::vdisk_list($storecfg, undef, $vmid);
@ -2612,6 +2606,12 @@ sub destroy_vm {
}; };
warn $@ if $@; warn $@ if $@;
if ($keep_empty_config) {
PVE::QemuConfig->write_config($vmid, { memory => 128 });
} else {
PVE::QemuConfig->destroy_config($vmid);
}
} }
sub parse_vm_config { sub parse_vm_config {