]> git.proxmox.com Git - qemu-server.git/commitdiff
QemuMigrate: phase2_cleanup misses migrate_cancel
authorStefan Priebe <s.priebe@profihost.ag>
Tue, 1 Jan 2013 21:59:55 +0000 (22:59 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Wed, 2 Jan 2013 05:36:53 +0000 (06:36 +0100)
Signed-off-by: Stefan Priebe <s.priebe@profihost.ag>
PVE/QemuMigrate.pm

index 4239e511ad354af79295f2fda4e982e6711f14cf..de2ee578556a6d8129c9083b32df626c0edd91a6 100644 (file)
@@ -470,6 +470,12 @@ sub phase2_cleanup {
 
     $self->log('info', "aborting phase 2 - cleanup resources");
 
+    $self->log('info', "migrate_cancel");
+    eval {
+       PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "migrate_cancel");
+    };
+    $self->log('info', "migrate_cancel error: $@") if $@;
+
     my $conf = $self->{vmconf};
     delete $conf->{lock};
     eval { PVE::QemuServer::update_config_nolock($vmid, $conf, 1) };