[pve-devel] r5034 - qemu-server/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-08-20 06:06:07 +0000 (Fri, 20 Aug 2010)
New Revision: 5034

Modified:
   qemu-server/trunk/ChangeLog
   qemu-server/trunk/Makefile
   qemu-server/trunk/changelog.Debian
   qemu-server/trunk/qmigrate
Log:


Modified: qemu-server/trunk/ChangeLog
===================================================================
--- qemu-server/trunk/ChangeLog	2010-08-19 12:46:25 UTC (rev 5033)
+++ qemu-server/trunk/ChangeLog	2010-08-20 06:06:07 UTC (rev 5034)
@@ -1,3 +1,7 @@
+2010-08-20  Proxmox Support Team  <support at proxmox.com>
+
+	* qmigrate (phase2): abort if migration status is 'failed'
+
 2010-07-19  Proxmox Support Team  <support at proxmox.com>
 
 	* QemuServer.pm (change_config_nolock): carefully catch write

Modified: qemu-server/trunk/Makefile
===================================================================
--- qemu-server/trunk/Makefile	2010-08-19 12:46:25 UTC (rev 5033)
+++ qemu-server/trunk/Makefile	2010-08-20 06:06:07 UTC (rev 5034)
@@ -2,7 +2,7 @@
 
 VERSION=1.1
 PACKAGE=qemu-server
-PKGREL=17
+PKGREL=18
 
 DESTDIR=
 PREFIX=/usr

Modified: qemu-server/trunk/changelog.Debian
===================================================================
--- qemu-server/trunk/changelog.Debian	2010-08-19 12:46:25 UTC (rev 5033)
+++ qemu-server/trunk/changelog.Debian	2010-08-20 06:06:07 UTC (rev 5034)
@@ -1,3 +1,9 @@
+qemu-server (1.1-18) unstable; urgency=low
+
+  * small bug fix im qmigrate
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 20 Aug 2010 08:05:21 +0200
+
 qemu-server (1.1-17) unstable; urgency=low
 
   * carefully catch write errors

Modified: qemu-server/trunk/qmigrate
===================================================================
--- qemu-server/trunk/qmigrate	2010-08-19 12:46:25 UTC (rev 5033)
+++ qemu-server/trunk/qmigrate	2010-08-20 06:06:07 UTC (rev 5034)
@@ -341,6 +341,10 @@
 		}
 	    }
 
+	    if ($ms eq 'failed' || $ms eq 'cancelled') {
+		die "aborting\n"
+	    }
+
 	    last if $ms ne 'active';
 	} else {
 	    die "unable to parse migration status '$stat' - aborting\n";