---

yaml --- r: 234227 b: refs/heads/master c: bd1c0ad h: refs/heads/master i: 234225: dc01e7a 234223: bed15a0 v: v3
git-mirror · Feb 25, 2011 · 9680736 · 9680736
1 parent 4a52193
commit 9680736
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8b7458363b9174f3c2196ca6085630b4b30b7a1
+refs/heads/master: bd1c0ad28451df4610d352c7e438213c84de0c28
diff --git a/trunk/drivers/xen/manage.c b/trunk/drivers/xen/manage.c
@@ -38,7 +38,6 @@ static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
 static int xen_hvm_suspend(void *data)
 {
 	int err;
-	struct sched_shutdown r = { .reason = SHUTDOWN_suspend };
 	int *cancelled = data;
 
 	BUG_ON(!irqs_disabled());
@@ -50,7 +49,12 @@ static int xen_hvm_suspend(void *data)
 		return err;
 	}
 
-	*cancelled = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
+	/*
+	 * This hypercall returns 1 if suspend was cancelled
+	 * or the domain was merely checkpointed, and 0 if it
+	 * is resuming in a new domain.
+	 */
+	*cancelled = HYPERVISOR_suspend(0UL);
 
 	xen_hvm_post_suspend(*cancelled);
 	gnttab_resume();