deactivate volumes if vm start command fails

also for current master
cleanup of patch from Dhaussy Alexandre from 02/15/2016

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 1c8fe5fd94b144e0fef6e03524d4eedd94113583..aad13bd0240e2ee6bfd11892bb7ae2638f5076ad 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4577,8 +4577,12 @@ sub vm_start {
 
        eval  { run_command($cmd, timeout => $statefile ? undef : 30,
                    umask => 0077); };
-       my $err = $@;
-       die "start failed: $err" if $err;
+
+       if (my $err = $@) {
+           # deactivate volumes if start fails
+           eval { PVE::Storage::deactivate_volumes($storecfg, $vollist); };
+           die "start failed: $err";
+       }
 
        print "migration listens on $migrate_uri\n" if $migrate_uri;