mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Ian Campbell 2011-02-17 11:04:20 +00:00 committed by Stefano Stabellini
parent ceb1802947
commit 36b401e2c2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/xen/manage.c
View File

@ -36,6 +36,7 @@ static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
struct suspend_info { struct suspend_info {
int cancelled; int cancelled;
unsigned long arg; /* extra hypercall argument */
}; };
#ifdef CONFIG_PM_SLEEP #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 * or the domain was merely checkpointed, and 0 if it
* is resuming in a new domain. * is resuming in a new domain.
*/ */
si->cancelled = HYPERVISOR_suspend(0UL); si->cancelled = HYPERVISOR_suspend(si->arg);
xen_hvm_post_suspend(si->cancelled); xen_hvm_post_suspend(si->cancelled);
gnttab_resume(); gnttab_resume();
@ -97,7 +98,7 @@ static int xen_suspend(void *data)
* or the domain was merely checkpointed, and 0 if it * or the domain was merely checkpointed, and 0 if it
* is resuming in a new domain. * 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); xen_post_suspend(si->cancelled);
gnttab_resume(); gnttab_resume();
@ -149,6 +150,11 @@ static void do_suspend(void)
si.cancelled = 1; si.cancelled = 1;
if (xen_hvm_domain())
si.arg = 0UL;
else
si.arg = virt_to_mfn(xen_start_info);
if (xen_hvm_domain()) if (xen_hvm_domain())
err = stop_machine(xen_hvm_suspend, &si, cpumask_of(0)); err = stop_machine(xen_hvm_suspend, &si, cpumask_of(0));
else else