0006-libxl-pause-also-stubdomain-if-any-while-pausing-a-d.patch

From c282684f846ee39dfa28084dbcaad33f7c07a46a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 25 Nov 2015 00:48:56 +0100
Subject: [PATCH] libxl: pause also stubdomain (if any) while pausing a domain
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise stubdomain would crash, if host suspend was in effect in the
meantime.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
---
 src/libxl/libxl_driver.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 2feaefc00c..9c0b8c866c 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1167,6 +1167,15 @@ libxlDomainSuspend(virDomainPtr dom)
         goto endjob;
 
     if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_PAUSED) {
+        int stubdom_domid = libxl_get_stubdom_id(cfg->ctx, vm->def->id);
+        if (stubdom_domid) {
+            if (libxlDomainPauseWrapper(cfg->ctx, stubdom_domid) != 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("Failed to suspend domain '%1$d' with libxenlight"),
+                               stubdom_domid);
+                goto endjob;
+            }
+        }
         if (libxlDomainPauseWrapper(cfg->ctx, vm->def->id) != 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Failed to suspend domain '%1$d' with libxenlight"),
@@ -1203,6 +1212,8 @@ libxlDomainResume(virDomainPtr dom)
     libxlDriverConfig *cfg = libxlDriverConfigGet(driver);
     virDomainObj *vm;
     virObjectEvent *event = NULL;
+    libxl_dominfo d_info;
+    int stubdom_domid;
     int ret = -1;
 
     if (!(vm = libxlDomObjFromDomain(dom)))
@@ -1220,12 +1231,31 @@ libxlDomainResume(virDomainPtr dom)
         goto endjob;
 
     if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
+        stubdom_domid = libxl_get_stubdom_id(cfg->ctx, vm->def->id);
         if (libxlDomainUnpauseWrapper(cfg->ctx, vm->def->id) != 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Failed to resume domain '%1$d' with libxenlight"),
                            vm->def->id);
             goto endjob;
         }
+        if (stubdom_domid) {
+            /* stubdomain may not be paused, for example in case of
+             * virCreateWithFlags(..., VIR_DOMAIN_START_PAUSED), so first check
+             * for that
+             */
+            if (libxl_domain_info(cfg->ctx, &d_info, stubdom_domid) != 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("Failed to get '%1$d' stubdomain state with libxenlight"),
+                               stubdom_domid);
+                goto endjob;
+            }
+            if (d_info.paused && libxlDomainUnpauseWrapper(cfg->ctx, stubdom_domid) != 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("Failed to resume domain '%1$d' with libxenlight"),
+                               stubdom_domid);
+                goto endjob;
+            }
+        }
 
         virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
                              VIR_DOMAIN_RUNNING_UNPAUSED);
-- 
2.45.2