aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen/manage.c
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-02-17 11:04:20 +0000
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2011-02-25 16:43:11 +0000
commit36b401e2c2788c7b4881115ddbbff603fe4cf78d (patch)
treeb6e3a794e84619d661ebd1d01216ce7dbe9d2e83 /drivers/xen/manage.c
parentxen: suspend: refactor cancellation flag into a structure (diff)
downloadlinux-dev-36b401e2c2788c7b4881115ddbbff603fe4cf78d.tar.xz
linux-dev-36b401e2c2788c7b4881115ddbbff603fe4cf78d.zip
xen: suspend: pass extra hypercall argument via suspend_info struct
Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen/manage.c')
-rw-r--r--drivers/xen/manage.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 5c0184fb9d84..6ce6b91e7645 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -36,6 +36,7 @@ static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
struct suspend_info {
int cancelled;
+ unsigned long arg; /* extra hypercall argument */
};
#ifdef CONFIG_PM_SLEEP
@@ -58,7 +59,7 @@ static int xen_hvm_suspend(void *data)
* or the domain was merely checkpointed, and 0 if it
* is resuming in a new domain.
*/
- si->cancelled = HYPERVISOR_suspend(0UL);
+ si->cancelled = HYPERVISOR_suspend(si->arg);
xen_hvm_post_suspend(si->cancelled);
gnttab_resume();
@@ -97,7 +98,7 @@ static int xen_suspend(void *data)
* or the domain was merely checkpointed, and 0 if it
* is resuming in a new domain.
*/
- si->cancelled = HYPERVISOR_suspend(virt_to_mfn(xen_start_info));
+ si->cancelled = HYPERVISOR_suspend(si->arg);
xen_post_suspend(si->cancelled);
gnttab_resume();
@@ -150,6 +151,11 @@ static void do_suspend(void)
si.cancelled = 1;
if (xen_hvm_domain())
+ si.arg = 0UL;
+ else
+ si.arg = virt_to_mfn(xen_start_info);
+
+ if (xen_hvm_domain())
err = stop_machine(xen_hvm_suspend, &si, cpumask_of(0));
else
err = stop_machine(xen_suspend, &si, cpumask_of(0));