From: Jason Andryuk <andryuk@aero.org>
Date: Fri, 20 Jun 2014 13:10:03 +0000 (-0400)
Subject: libxl: Use cooperative resume for migration
X-Git-Tag: v1.2.6-rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1bc06e2d73882f4c8abfef67628211e8f878bc3;p=thirdparty%2Flibvirt.git

libxl: Use cooperative resume for migration

Migration code specifies the problematic non-cooperative resume mode
which is a known issue with Xen's libxl [1].  Instead, use the better
supported cooperative mode.

Without this, guests BUG() in xen_irq_resume after failing to bind
still-bound event channels.

[1] http://bugs.xenproject.org/xen/bug/30
---

diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index a25edf0baa..53d961c1e5 100644
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -147,7 +147,7 @@ libxlDoMigrateSend(libxlDriverPrivatePtr driver,
                                xl_flags, NULL);
     if (ret != 0) {
         /* attempt to resume the domain on failure */
-        if (libxl_domain_resume(priv->ctx, vm->def->id, 0, 0) != 0) {
+        if (libxl_domain_resume(priv->ctx, vm->def->id, 1, 0) != 0) {
             VIR_DEBUG("Failed to resume domain following failed migration");
             virDomainObjSetState(vm, VIR_DOMAIN_PAUSED,
                                  VIR_DOMAIN_PAUSED_MIGRATION);