This function has been used in one place only into which we inlined its
functionality. Removing it avoids confusion between vm_destroy and vm_destroy.
The whole $importfn is executed in a lock_config_full.
As a consequence, for the inlined code:
1. lock_config is redundant
2. it is not possible that the VM has been started (check_running) in the
meanwhile
Additionally, it is not possible that the "lock" property has been written into
the VM's config file (check_lock) in the meanwhile
Add warning after eval so that it does not go unnoticed if it ever comes into
action.
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
# reload after disks entries have been created
$conf = PVE::QemuConfig->load_config($vmid);
# reload after disks entries have been created
$conf = PVE::QemuConfig->load_config($vmid);
- PVE::QemuConfig->check_lock($conf);
my $firstdisk = PVE::QemuServer::resolve_first_disk($conf);
$conf->{bootdisk} = $firstdisk if $firstdisk;
PVE::QemuConfig->write_config($vmid, $conf);
my $firstdisk = PVE::QemuServer::resolve_first_disk($conf);
$conf->{bootdisk} = $firstdisk if $firstdisk;
PVE::QemuConfig->write_config($vmid, $conf);
my $err = $@;
if ($err) {
my $skiplock = 1;
my $err = $@;
if ($err) {
my $skiplock = 1;
- eval { PVE::QemuServer::vm_destroy($storecfg, $vmid, $skiplock); };
+ # eval for additional safety in error path
+ eval { PVE::QemuServer::destroy_vm($storecfg, $vmid, undef, $skiplock) };
+ warn "Could not destroy VM $vmid: $@" if "$@";
die "import failed - $err";
}
};
die "import failed - $err";
}
};
-sub vm_destroy {
- my ($storecfg, $vmid, $skiplock) = @_;
-
- PVE::QemuConfig->lock_config($vmid, sub {
-
- my $conf = PVE::QemuConfig->load_config($vmid);
-
- if (!check_running($vmid)) {
- destroy_vm($storecfg, $vmid, undef, $skiplock);
- } else {
- die "VM $vmid is running - destroy failed\n";
- }
- });
-}
-
# vzdump restore implementaion
sub tar_archive_read_firstfile {
# vzdump restore implementaion
sub tar_archive_read_firstfile {